Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add control_toolbox repo (backport #687) #688

Merged
merged 1 commit into from
Jan 15, 2025
Merged

Add control_toolbox repo (backport #687) #688

merged 1 commit into from
Jan 15, 2025
+12 −0

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 15, 2025

Add the repo to the semi-binary builds

This is an automatic backport of pull request #687 done by Mergify.

@mergify Mergify
Copy link
Contributor Author

mergify bot commented Jan 15, 2025

Cherry-pick of 66b61ab has failed:

On branch mergify/bp/humble/pr-687
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 66b61ab.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   ros2_control_demos.humble.repos

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ros2_control_demos.jazzy.repos
	both modified:   ros2_control_demos.rolling.repos

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Jan 15, 2025
@christophfroehlich christophfroehlich merged commit 173d3d4 into humble Jan 15, 2025
4 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-687 branch January 15, 2025 22:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@christophfroehlich